From 99c0b3db061346feca36ca052bb99b9738344b17 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 20 Jun 2014 00:39:59 -0400 Subject: [PATCH] Adapt the icontheme tests With the new way of dealing with the legacy stock icons, the builtin test needed some small updates. --- testsuite/gtk/icontheme.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testsuite/gtk/icontheme.c b/testsuite/gtk/icontheme.c index aae7cc6104..41b40f9ee7 100644 --- a/testsuite/gtk/icontheme.c +++ b/testsuite/gtk/icontheme.c @@ -478,10 +478,10 @@ test_svg_size (void) static void test_builtin (void) { - assert_icon_lookup_size ("gtk-color-picker", 16, GTK_ICON_LOOKUP_USE_BUILTIN, NULL, 16); - assert_icon_lookup_size ("gtk-color-picker", 20, GTK_ICON_LOOKUP_USE_BUILTIN, NULL, 20); - assert_icon_lookup_size ("gtk-color-picker", 24, GTK_ICON_LOOKUP_USE_BUILTIN, NULL, 24); - assert_icon_lookup_size ("gtk-caps-lock-warning", 30, GTK_ICON_LOOKUP_USE_BUILTIN, NULL, 30); + assert_icon_lookup_size ("gtk-color-picker", 16, GTK_ICON_LOOKUP_USE_BUILTIN, "/org/gtk/libgtk/icons/hicolor/16x16/actions/gtk-color-picker.png", 16); + assert_icon_lookup_size ("gtk-color-picker", 20, GTK_ICON_LOOKUP_USE_BUILTIN, "/org/gtk/libgtk/icons/hicolor/24x24/actions/gtk-color-picker.png", 20); + assert_icon_lookup_size ("gtk-color-picker", 24, GTK_ICON_LOOKUP_USE_BUILTIN, "/org/gtk/libgtk/icons/hicolor/24x24/actions/gtk-color-picker.png", 24); + assert_icon_lookup_size ("gtk-color-picker", 30, GTK_ICON_LOOKUP_USE_BUILTIN, "/org/gtk/libgtk/icons/hicolor/24x24/actions/gtk-color-picker.png", 30); } static void @@ -538,6 +538,7 @@ test_list (void) theme = get_test_icontheme (); icons = gtk_icon_theme_list_icons (theme, NULL); + g_assert (g_list_find_custom (icons, "size-test", (GCompareFunc)g_strcmp0)); g_assert (g_list_find_custom (icons, "simple", (GCompareFunc)g_strcmp0)); g_assert (g_list_find_custom (icons, "twosize-fixed", (GCompareFunc)g_strcmp0)); -- 2.30.2